merged 1.1.6 into 1.2