New development branch for 1.1.8-SNAPSHOT