NXP-14323: improve concurrent update detection