Fixed bug with top facet rows/cols.
Merge branch 'release-2.3'