acu114903 [rs-base] Iterate on code review(s)