See https://github.com/EiffelSoftware/es-libraries/pull/4