Merge "Do not force endDocument for domain verify settings" into sc-dev