Re: Apply bc7f2cd7559c5595dc38b909ae9a8d43e0215994 to 5.4+