changes for billy
Merge branch 'hotfix/marketing-12-19'