bugs: PLUS-1161, PLUS-1065,