ERT-418: Removed separate xxx_set boolean flag