Merge branch 'master' into price-scraper-ML-integration #6403

Job	Run time
lint-code	7s
test-application-3-12 / test-application	3m 11s
test-application-3-11 / test-application	3m 35s
test-application-3-10 / test-application	3m 38s
	10m 31s

Provide feedback