BUG-4684: validate changes against effective state