Commit v1.6.0.4