[BISEVER-9012] -- Code review comment fixes