WEB-162, WEB-170, Design Fixes
Merge branch 'dev-master' into best_practice_guide