case 3651 - Proper elements for loans form.
Merge branch 'case-3651' into develop