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