Merge remote-tracking branch 'remotes/gkurz/tags/fixes-for-2.9' into staging