セキュリティトークン処理を改善
Merge branch 'feature/security-token'