NBIA-742, NBIA -748 and NBIA-749 Fix