markers: add special handling for extra
#636
+123
−4
Merged
extra
#636