[ref_impl_eiffel] [1396] Updates for annotations control.

Revision: 1396
Author: thomas.beale
Log Message: