Merge branch 'v1.1-dev' as v1.1.4