Merge branch '3786_rpm_echo'