Merge "AppsControllerExternalRequest class fix"