merge(dev): more highlights discovered