Merge "Display correct expiration time of service record" into main