last 4 commits were for v1.1