Ludovic this is a updated cross-base patch with a more appropriate commit log.