[PATCH conductor 1/1] Bugzilla: 690960