Merge "Fix expires typo in comment"