DS-1581 Prevent double-up of restriction message

Backported 579f3aee095dc5da424ab0eb03dfe504b57e8ff1 to 1.8.x