PIM-1437 : Try to fix audit scenario
PIM-1437 : Update