Merge branch 'rh/ishes-doc'