BS-1998, back port fixes on report style lost after merge.