Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging