Implement missing NewState Limitation

Issue: https://jira.ez.no/browse/EZP-22776
Copy past, should remove these