BZ-9194 more changes