Merge branch 'bugfix/7778_unnecessary_ads_usage' into develop