NXP-10308: correct persistence in single-datasource mode or not