[ref_impl_eiffel] [1319] MERGE of BMM upgrade changes to this branch from adl1.5-bmm branch.

Revision: 1319
Author: thomas.beale
Log Message: