CORE-4836: omit empty property groups
CORE-4836: added code to fix the paths for default input files