Merge remote branch 'remotes/peteg/revert' into revert