CORE-13742

r75741 affected
r75735 affected guilty
r75734 ok
r75712 ok