Merge "Fix & clean up intent handling"