issuesCls#43
Merge branch 'develop' into release