Merge develop for 1.1.2 release