Merge "Fix operators priority to prevent NullPointerException"