Release 2.1.1.6 and 2.1.1.7