Update branch to v4.0.4 and fix last commit