Merge commit '8aaababcb1517e637a386d6ffd101799c03bf15d' into crate