MT#9263 Fix CF API handling of timesets.

(cherry picked from commit 3d22196c4a3e2a3c5a39e8b022b68cc8bbda4f67)