[RJA-2085][fix] - Change set is not being disabled