feat: Issue #3341675: Initial implementation