merged from rhdemo