Merge branch 'fix/incorrect-expirations' into 'develop'