Updated to v1.5-r1