Issue #3332128: "show reset link" conflict with exposed sort

added 67 commits

• e207249a...3575d563 - 66 commits from branch project:3.0.x
• 6d992d52 - Merge branch '3.0.x' into 3332128-show-reset-link

Compare with previous version