Merge commit 'c24a9c6ef946ec1b5b280061d4f7b579aaac6707' into upstream-merge