Post release clean-up
Merge branch 'master' into tourapp
Post release clean-up