Add Macaron
Add Macaron
Manual merge: sorted + various fixes