Issue #3491068: combine patches for #2761187, #3386579, #3386590 to avoid to order to be messed up and fail applying