LILY-388: Fixed tenant being set for predefined presets
Merge branch 'feature/LILY-388-fix-tenant-of-preset-being-set' into develop