Reviewed: Reverted expire version
Merge branch 'development'