Merge pull request #15847 from hvitved/ruby/orm-field-as-source-no-args

Merge pull request #15847 from hvitved/ruby/orm-field-as-source-no-args #7486