Merge changes from topic "raspberry-pi-4-support" into integration