Update to final 1.5