Fork : Resolve wrong merging for 3892 commit.