Merged revamp branch until cross_toolchain related changes

2018-04-11, Edouard Tisserant