Merge "Use Duration instead of primitive for expiration time" into main