Merge "One namespace leftover fixes"