Merge branch 'VCL-1095_move_AD_unjoin' into develop