Merge from rta-rpm branch.