Apply OL/pull/984