Merge "Applied some fixes to Intents"