Merge remote-tracking branch 'upstream/master' into fix/product-pages-design-2232

# Conflicts:
#	src/app/modules/pro/settings/settings.component.html
#	src/app/modules/pro/subscription/subscription.component.html