merge 1668 with all features