Additional fix for NEXIOS-522
Merge branch 'master' of https://github.com/nexios/nexios