[OE-4054] Fixed conflicting field ids
Merge branch 'release/1.6' into develop