Merged doc changes