Update for commit d2cc34631a0c8a4109da7f528825f5bbddfa7fff