master
8191239: Improve desktop file usage
8187443: Forest Consolidation: Move files to unified layout