CDB-788 #fixes Renames our custom layers
Merge remote-tracking branch 'origin/feature/CDB-788' into release/2.4.0
Merge branch 'release/2.4.0' into release/2.4.0+