updates for 008
Merge branch 'master' into develop