Merge branch 'fix_HEJC_merge' into 'master'
(HEJC) fix code for merging configurations
See merge request hej/HEJ!338