march 12 fixes
Merge branch 'common/dev'

* common/dev:
  march 12 fixes

fixes from client