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

* commit 'd51ac09fd7db5d810452138749f9291617c0dbf7':
  Fix activity resolver, issues #6519130 and #6507239