refactor: rename drop_expired_messages to drop_expired_msgs
cosmetic
merge default into bug25327