SITE-386: Fix for issue with creating models