Minor updates
Merge branch 'refs/heads/mockup' into develop