IST-107, require units quantity non-blank
Merge branch 'master' into production