[pangzero/f29] (3 commits) ...New upstream commit