[GIT PULL] rpi: second round for v2020.07