Resolve #3506819 "Add better support"

Closes #3506819

changed target branch from 8.x-1.x to 2.0.x

added 4 commits

• 8d820820...8e16eb4e - 3 commits from branch project:2.0.x
• 18e9c405 - Added a hook to alter the filter options for double references

Compare with previous version

merged