Merge "Correct save/restore match up" into jb-mr2-dev