[HU-100] Added changes which were missed in last commit.