Intermediate commit on the way to OTT 2.2