DEPL-5733 Incorporating Vinnie's review feedback