Test an external ... simplification
Merge remote-tracking branch 'upstream/master' into xip_io