okapi r646
okapi r651
merge stable
Merge branch 'master' into next