Merge "Fix activity resolver, issues #6519130 and #6507239" into jb-dev