Bug 6739: (follow-up) fix conflicts with some others bugs.