Update for "fa413e49d8956319c394d0b38194b7c5361a8295"