New bug was fixed
Merge branch 'developer-AK'

Conflicts:
	test.c