DO NOT MERGE - FOR INTERNAL CODE REVIEW ONLY

:metal: