merge lib-common changes from development branch
Merge branch 'master' into dev-dependency-2