Core-1933 More changes in Application Controller