Mimic 3cc09affe4041583b493a0d4517891bc1d416561 into new branch.
LDP-5850 LDP-6383 partners menu selection.