TISTUD-5227 Incorporating the feedback