Merge branch 'rf/man-env'