Merge branch 'kyoshino-bug-809697-linux64-btn' into demo3-branch