Post release cleanup
Merge branch 'master' into tourapp
Post release cleanup