Merge remote-tracking branch 'remotes/riku/for-2.0' into staging