Merge "Fix blocker bugs as per Sonar report > >SMO-112 >"