first iteration
Merge branch 'dev' into optimization/appdesk_optimization
few changes
Merge branch 'optimization/appdesk_optimization' into dev