Fixed #556
Progress on #544
Merge branch 'master' of github.com:CERN/apvs