Development for v1.0.4.7