Implemented NEXIOS-628, NEXIOS-629, NEXIOS-630, NEXIOS-631.
Merge branch 'master' of https://github.com/nexios/nexios