Merge "DMD fix flicker vote" into 24D1-dev