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