ref #6932 Migrate marker type handler