Hi Miguel, your understanding is correct!
Regarding deep re-crypt of named disks and templates, we plan to introduce this feature in one of the post-GA releases.
Nikolay
