GTNPORTAL-2838 User's search box take so long time to display
Merge commit '1176c828a3b3157370a27fb3c34c06306ba3e00d' into HEAD
Merge commit '0f66ec751fab8ef2d110652e23201d0fc4d0adc8' into HEAD