Merge branch 'rhservice'