NXP-11472: follow changes on span vs div