[3rd Party Feed] Update (reverse-merged from commit 67c4521cc4ffd5b281f5428af1535fd6e878acc0)