Merge "Fixes to Indication sending"

No match.