Valera/fix start time end time

Work in progress.

BLD-529