rAKA/master-stable

features/doc_material_p…