Merge branch 'schmurfy/re_invert'