Merge branch 'rs/status-code-clean-up'