Merge "Night version of Intent resolver"