Merge branch 'master' into b1

 to explain why this merge is necessary,
Merge branch 'b1' of https://github.com/ss77892/demo into b1