merge and reorder asterisk-166 and 167