bug fix after merge
Merge branch 'master' into stay-in