WINTERMUTE: Merge with upstream