Merged fixes of SUPNXP-9183 in