Merge topics 'ASTERISK-25049', 'ASTERISK-25056'