[ref_impl_eiffel] [1432] Put up changes taken from last ADL 1.5 branch modification.

Revision: 1432
Author: thomas.beale
Log Message: