Merged from origin/raspberry-pi