Some improvements on building nested forms. [ci skip]
Merge pull request #13214 from JuanitoFatas/master

Some improvements on building nested forms. [ci skip]