Update to 03e3527 from source