merge in commit c09154fc04964152cc029ec1010e291993fcce46 from upstream