Progress on #734
Progress on #735 and #734
Merge branch 'master' of github.com:CERN/apvs
Fixed #766