Merge "Use bug to track all namespace related TODOs" into rvc-dev