[CB-2896] split writing of working tags off here, multipart tags not supported
Merge remote-tracking branch 'apache/master'