Merge branch 'hotfix/CEP-524'
Merge branch 'develop'
Merge branch 'develop'
CEP-530 adding old_parts to city suggest
Merge branch 'master' into develop