Merge remote-tracking branch 'upstream/develop-7.0' into feature-simple_unit_tests_7.0

Conflicts:
	engine/engine.xcodeproj/project.pbxproj
	engine/src/dispatch.h
[[ SimpleUnitTests ]] Port to 7.0 branch