Merged doc update