Merge branch 'sp_dev_rnis_wais_rel_update' of https://github.com/pastorsx/AdvantEDGE into sp_dev_rnis_wais_rel_update