[ref_impl_eiffel] [715] Set of changes to fix bug reported in AWB-147:

Revision: 715
Author: thomas.beale

Log Message: