Sort issues fixed on the Working Set and Project Tree
Merge with Master and fix Conflict Issue
Fixes after review
Fixes after second review
Fixes in getFilenameWithoutExtension
Merge pull request #4463 from TomMalbran/issues-4332-4409

[OPEN] Fix #4332 and #4409: Sort issues fixed on the Working Set and Project Tree