Merge "Fix intent handling"