Merge "Inaccurate mechanism drivers iteration fix."