Merge with upstream experimental changes (2)