Update with 1.1.8 from Development branch