Merge pull request #3086 from alecchendev/2024-05-holder-commitment