fix #813
Merge remote-tracking branch 'origin/next' into next