Merge branch 'rs/janitorial'