Merge no-protocol into version2