The code.
Merge branch 'Kris_App' into develop