PR of initial master commits

yes, the whole instance. consistency is more important.