Merge "Doc change: toc changes for restructuring of dev guide"