Merge "Use ‘resend’ instead of ‘bounce’ in GUI and source"