Merging v1.1.1 into development