App Load optimization
Merge commit '6eecad924ca49e96c05006088596363b9e3d2b9f'