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