PR of initial master commits

TODO what?