optimised result set to model conversion
Merge remote-tracking branch 'origin/master'