PRD-3949, PRD-4295, PRD-4449 and PRD-4492

Finalizing the crosstab work for this release.