Merge "Added expiration time and deprecation time support"