hot fix #1
hot fix #2
Merge branch 'master' into r4
r4 commit after hotfix