Merge branch 'hotfix/2.5.7'
Merge branch 'master' of github.com:aehrc/snorocket into develop