+ [OE-4196] bring up to date with latest changes to core