allow Acknowledge and Message
Merge branch 'master' into jupis