Merge changes from topic "update_mapping"

* changes:
  Rework how pinning works
  Follow prebuilt/API update