SBBP-41 Added Code Review Feedback
+review CR-1035