Merge remote-tracking branch 'gitlab/fix/0026236/5-4/FileVersionsAreSortedAndNumberedWrong' into release_5-4