Fix to issue1
Fix to issue 2
Merge branches 'issue1' and 'issue2' into dev_1.0
Fix to issue4
Fix to issue3
Merge branches 'issue3' and 'issue4' into dev_1.0

Conflicts:
	fix_issue1