[rhq] Changes to 'mtho11/bz861127'