cherrypick writer export tuple bug