Merge "prolog: Fix NoBlock and NoOp functions." into stable