Warning: this is an OE 2.0 update.