Merge "fix 'unary operator expected' in conditional expression" into stable/brahmaputra