See v1.7.0.3