Fix IDs of elements in the config reference to avoid filename collisions on case insensitive file systems.
Merge remote-tracking branch 'origin/rel-3_3' into rel-3_3