[ref_impl_eiffel] [1154] Partial commit of merge of 1144-1151 to TRUNK

Revision: 1154
Author: thomas.beale
Log Message: