Sync rb_program with the previous commit