Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev