DDF-695: Updated to allow temporal criteria to be ANDed.
Also created unit test that will fail if this issue occurs in the future.