Merge pull request #13578 from mattwire/entityform_view_towards