Patch/nmb#233

njiru wants to merge 3 commits into

softwaregroup-bg:patch/nmbsoftwaregroup-bg/ut-test:patch/nmbfrom

njiru:patch/nmbnjiru/ut-test:patch/nmbCopy head branch name to clipboard