7.12 local commit

7.12 local commit