Merge sudo fixes and split to two repos