Integrated format protocol against mark classes.
Merged master.