Some docs merging for rc1