Enhanced version
Merge branch 'fix-form-virtus'