5 Commits (state-res-closure-rebased)