Merge changes from v3 into Keystone to merge it