DS-1581 Prevent double-up of restriction message
Merge pull request #238 from aschweer/DS-1581-restrictionmessage

DS-1581 Prevent double-up of restriction message