Apply the core fix for #13771