Merge "NPE on "Nexus Imprint"" into nyc-dev