Issue/12460 port local changes2mapped

- [x] Depends on #12462

Fix #12460