BAP-3931: Add possibility to use an attribute with the same name in different scopes
Merge branch 'master' into feature/BAP-3931-impl
BAP-3931: Add possibility to use an attribute with the same name in different scopes
BAP-3931: Add possibility to use an attribute with the same name in different scopes
BAP-3931: Add possibility to use an attribute with the same name in different scopes
BAP-4172: fix MD and JS tests
BAP-4172: fix MD and JS tests
BAP-4172: Fix CS
Merge pull request #1938 from laboro/fix/BAP-4172

Fix/bap 4172
Merge master into feature/BAP-3931
Merge pull request #1940 from laboro/feature/BAP-3931_entity_configs

BAP-3931: Add possibility to use an attribute with the same name in different scopes
Merge remote-tracking branch 'remotes/dev/master'