okapi r646
okapi r651
merge stable