Merge "Mitigate Intent Capturing vulnerability"