[addressess #51849239]update change log
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	CHANGELOG