AMCAT-30 #resolved remove code label
Merge branch 'hotfix_save_code_label' into dev