update lang keys CAM-1501
update changelog
Merge remote-tracking branch 'origin/dev' into dev
update changelog