Update for "fad6292c33cad3da7780e57164d264f26e786afc"