Merge remote-tracking branch 'origin/bewest/hakken-bump'