Merge compatible edits from mk802(/512) + mk802ii