Starting 2.0.4 hotfix branch