Manual merge for NUI v0.2.37