Integrate bugfixes from 5.3