NXP-14278: updates
NXP-14279: MongoDB basic query builder