Fixed name of contentDataType parameter. (Bug 40420)
Merge branch 'release-2.4.1' into release-3.0.0