These are the patches should be merge in
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44920 but missed.