JER-1710

@JER-1710