PR of initial master commits

Does not test anything :-(