Continuation of #4178

@kkrampa @czue