Merge "Fix inherited dashboard links"