merge ofop-red branch which should not be necessary any more