Merge branch 'feature/graph_on_os_type' & resolve merge conflicts