Merge pull request #14170 from kritik/master

there could be more than 10 nested records
Conflicts:
	actionview/CHANGELOG.md