New attempt to merge Sugarizer/SugarOS