Changes for BZ 8481