Merged projectswg/holocore into quality_assurance