CON-679: CON-621