TISTUD-3015: incorporated review feedback.