Modified data type options tag to fix disabed typo
Merge remote-tracking branch 'origin/hotfixes' into development

Conflicts:
	Core/RELEASE-NOTES --> merged remote