Merge "Prioritize strength error over hardware error" into main