OKAPI Project update (r896)