cancel activity
Merge remote-tracking branch 'origin/ria' into ria