[fix] #1338 Quick sync UD computation might be incorrect sometimes (cherry-picked + adapted from dev)