tag upstream commit 0d5b0cf4