Merge branch 'hotfix/issue-#175'
Update gem version
Add updates for 2.6.3
Merge branch 'master' into develop