Merge remote-tracking branch 'origin/dev' into fix/mark_required_fields

Conflicts:
	doc/CHANGELOG.md