Merge pull request #3018 from jkczyz/2024-04-optional-description