NXP-14727, NXP-14979: follow new init, force use of JOINs