Commit 39b32d45 authored by Skia's avatar Skia

Some com templates improvments and reordering some models

parent d2da5716
Pipeline #812 failed with stage