RB 505 merge.