Merge robjos changes