mini DIGMA 28

Sammansätt order is done, and is now going to get merged with mini DIGMA
28