Merge branch 'hotfix/Hotfix_1' into develop

Conflicts:
	README.md
release commit
Merge branch 'release/My_Next_Release'

Conflicts:
	README.md