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