Fixed #MBL-10541 re factoring CheckActionState