Merge "Fix backup and restore of package blocks" into oc-dev