Merge "Update Index and Path Documents"