am d0f7f418: Merge "Freeing frame map"

* commit 'd0f7f41828493b0679e908f7bb3ed3b8e838c463':
  Freeing frame map