Manually rolled in changes from f554ce9