Additional fixes and clean-up
Merge branch 'refs/heads/mockup' into develop