Merge branch 'oauth-entities-expiration-tweaks' into 'develop'