NXP-16212: refactoring indexation, removing post commit listener