Merge "Adds expirations for remote callbacks" into sc-dev