Unit tests passed after rbdevel/master merge.