Issue #1819 was fixed.
Merge branch 'develop' into rid-set-sbtree