Merge branch 'release/0.9.3'
Merge branch 'develop'
fix expiring value to be in seconds
Merge branch 'hotfix/0.9.5' into develop