SUPNXP-8439: more backport for single-datasource