Bug 9878: Add consistentcy on restriction messages