NXP-12930: improve concurrent update detection and behavior