595-57 partial commit
Merge branch 'master' into 595-57