NXP-10235: fix index creation
Merge branch 'master' into feature-NXP-4406-db2
NXP-4406: non-optimized security checks for DB2