This commit includes all the changes from the CE
branch: 51122-fix-navigating-discussions to port
the changes to EE.