Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a

* changes:
  Fixed the documentation and unit tests
  Disabled the tests
  Added expiration time and deprecation time support