Migration pull request

Fixes for cpr-transfer (live update functionality).