Merge "CDD: Updates to changelog, TOC fix" into mnc-dev