Merge 45730 (rapps link fix)