Jshaughn/1094540

BZ 1094540 for review