Excellent! Merged. Thank you!
(But reverted the /rw related changes as per /rw/config versus /usr/local/etc)