Cherry-pick two nav items changes to 15.5
Closes #1314 (closed).
!3230 (merged) and !3214 (merged) should be backported to 15.5.
Edited by Achilleas Pipinellis
Closes #1314 (closed).
!3230 (merged) and !3214 (merged) should be backported to 15.5.