BEARS-1161

BEARS-1161