Merge "Add PHPUnit test to ApiQueryDisabled"