Patch updated against current master (954ca0f017f62f52ee679f2aa68effb20c917278).