NXP-12312-12357: Fix CMISQL Join Issues