Temp beta for v.1.5.0