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