Align with drb 1.0b3