Changes due to 1.5.2 announcement