Changes to State Management in build 4151