Fixed missing patch for rb_id_only tag
Merge branch 'develop/6' of into develop/6