Update -core dependency to 1.1.6, update code accordingly

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>