This preview of pull request 1827 is meant for internal use only.