BUG-7464: Fix original porting damage in conditional operations