Merge "Fix RD bug."