Chart the type of operating system
Merge remote-tracking branch 'remotes/origin/feature/graph_on_os_type' & resolve conflicts