Merge "Fix failing 5GBulk pm"