Merge branch 'rs/micro-cleanups'