Worked on #576 and on #561 and on Blisly