Merge "BUG-421: Define multipart-transaction-aware"