Merge "DMD fix flicker vote" into main