[sr-dev] git:master: acc(k): Replace custom time arithmetics logic with existing macro