[FIX] code changes where wait as date is used

Merged Leandro Martinek requested to merge 7.0-waits_to_datetime into 7.0-stage

Merge request reports