BS-9613 Fix and complete Operation validation