Merge pull request #1623 from sebweb3r/acknowledgment

Unify acknowledgment