Issue refs #1464: partially implemented
Merge branch 'master' of github.com:olegsmith/apinet-server