Issue #1604 embedded rid bag implementation improvements.