Merge "switch identity back to V4"