Merge branch 'need-reboot-flag' into 'develop'