Merging changes in Form Loader src folder