#4665 by Jon A.

#4666 by Jon A.