Update for "9c42e988a425d9374174e8b0e54f3697f7057e30"