Merge branch 'hold/rpm'