Feature/cms 3.0.5