Master to 0.5.0