Apply fc7bf4c0d65a342b29fe38c332db3fe900b481b9 to 5.15