Bug Fixes
Merge branch 'master' into update_07