Closes #1741
Closes #1742
Merge branch 'issue-1742'
Updated Version 3.0.1
Merge branch 'master' into develop

Conflicts:
	version.txt
Closes #1739
Fixes typo of issue #1738
Closes #1738
Closes #1736
Closes #1735
Closes #1733
Updated Version 3.0.2
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-reporting