Merge pull request #4598 from 0xced/encrypted-age-gate