Updates for BZ-1067772