Sync with commit 40467edc4f047279deb3f69ca12ef5c5ac6d11e7