Updating rbelec-master with the changes made in rb-master

pulling changes made to the main branch