Merge changes from topic 'ASTERISK-27625'