Merge branch 'hotfix/1.7.1'
Trying to comply with adsense TOS
Merge branch 'hotfix/1.7.2' into develop