OKAPI Project update (r1031)