Additional commits

Additional commits i suppose can be backported to prado 3.2.4.