Fix cleared scope field in attribute form when toggling unique
Merge branch 'master' into update_bap_beta