issue #23272: support orderby on toOne
correct billing version
Merge pull request #1363 from shackbarth/23272

issue #23272: support orderby on toOne