Merge 2.1.1 into releases