tgupdate: merge t/girocco/restrictions into girocco base