Other better indentation
Merge branch 'ApplicationDebug' into develop