Merge "Delete TODO and file a bug." into mnc-dev