CDAP-983 move set out of if.