NB-7416

NB-7416
Tab for #7401 & #7404

Add to Quote
NB-7416 Tab for #7401 & #7404