Dev labelization patch 0 cleaner

Don't be afraid of non-automatic merging. If there is one thing I can do now, it's deal with "<<<<<<
>>>>>> {} <<<<<<< 7c8c38c142cf4091274aa8e1b68920676483751f CmtMsg" blocks, and, if it's for a few files only, I can walk you through the process. 
this is also regression. before any commit i recommend to pull upstream and review all changes.