Update for "276b86429026723bb247dedda75218c7dae61fa1"