Remove some of the persistent unit handling in Merge
Remove some of the persistent unit handling in Merge

lukedirtwalker/Envision,Vaishal-shah/Envision,lukedirtwalker/Envision,Vaishal-shah/Envision,Vaishal-shah/Envision,mgalbier/Envision,mgalbier/Envision,dimitar-asenov/Envision,Vaishal-shah/Envision,lukedirtwalker/Envision,BalzGuenat/Envision,lukedirtwalker/Envision,BalzGuenat/Envision,dimitar-asenov/Envision,dimitar-asenov/Envision,BalzGuenat/Envision,mgalbier/Envision,mgalbier/Envision,Vaishal-shah/Envision,mgalbier/Envision,dimitar-asenov/Envision,BalzGuenat/Envision,dimitar-asenov/Envision,lukedirtwalker/Envision,BalzGuenat/Envision,BalzGuenat/Envision,dimitar-asenov/Envision,Vaishal-shah/Envision,lukedirtwalker/Envision,mgalbier/Envision