Apply 0a6de78cff60 to 5.15+