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