Merge remote-tracking branch 'remotes/upstream/develop' into WIXFEAT4190

Conflicts:
	src/burn/engine/plan.cpp