Schema fix 2#1

cjxh wants to merge 2 commits intoblackentropy:schema-fix-2blackentropy/samlify:schema-fix-2from

tryretool:schema-fix-2tryretool/samlify:schema-fix-2Copy head branch name to clipboard