Merge branch 'hotfix/1.11.4'
Addenum file added and send-to-friend links
Merge branch 'hotfix/1.11.5' into develop