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

Revision: 1156
Author: thomas.beale
Log Message: