acu114906 [rs-base] Updates based on initial review