Merge "fix(ff-a): no NS attribute in hypervisor retrieve request"