Applied fix for RT 86900, some package housekeeping