first commit with Sebastian Grauwin's code for v2.2