MC-72: Fix cs and doc