BISERVER-8103: Refactor end time