Introduce latest changes from 565cfe7