Merge branch 'remove-footguns' into 'develop'