Merge remote-tracking branch 'origin/lego' into lego

Conflicts:
	core/api/getHTMLParts/index.js