MT#7141 upgrade packaging style