Merge "Doc index issue fix"