merge from Rbi branch