[ro] recover (master)
[ro] update against templates (master)