Merge branch 'b-3.6.1' into mebil