Merging develop for channel header ad documentation