Minidoc

#1440 follow up