Issue #3491068: combine patches for #2761187, #3386579, #3386590 to avoid composer failing to apply patches due to order

Issue #3491068: combine patches for #2761187, #3386579, #3386590 to avoid composer failing to apply patches due to order #6024