Prepare 3.3.6 hotfix
Reset for development