*addressing sbm m2 review requests#180

okalenyk wants to merge 2 commits intomainsctllabs/societal-node:mainfrom

feature/sbp_m2_fixessctllabs/societal-node:feature/sbp_m2_fixesCopy head branch name to clipboard