Update for "e6362b5779cac9a04d0bde81a2cfc6d306372dec"