Re #1709 changes reflecting latest version of corelib