Resolve JS-163 "Time of service"

Merged Jose Luis Zanotti requested to merge JS-163-Time_of_service into 7.0-stage

Closes JS-163

Merge request reports