Second attempt to fix #777, still ensuring the rendering row count is sensible - just using a correct interpretation
Merge branch 'master' into fixes
Build for internal release