Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream