Backports for Prado 3.2.4