Merge branch 'release/versions' into develop
added masnun as author
Merge branch 'develop'