2 bugs are fixed: 31806, 31817