quick fix v1.1 for production
fixed merge conflict
release notes