Fix for bug #74180: Commit and port changes to the release - AliFileMerger