Work on mergeable handler features