Merge branch 'develop' into 162-goto-for-head-cannot-be-cancelled

Merge branch 'develop' into 162-goto-for-head-cannot-be-cancelled #450