Mercurial 2.5

Closes #17578.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ivy 2.3.0

Closes #17577.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>