We have started to use 2.9 functionality
Latest is 2.12 but keeping 2.9 for maximum compatibility

Signed-off-by: Erik Jaegervall <[email protected]>