am 61a3c8de: Merge "Offer to move both code and data together." into mnc-dev

* commit '61a3c8dec90acebef15ef56cae14efea69279f69':
  Offer to move both code and data together.