Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into staging