Merge upstream Org (from commit 488eea)