Format markers

[merge]