Pull1888

Replacement for #1888.