Also check for undefined orderBy
Merge branch 'master' into 4_5_x_working