Both CRs add either (target) AMF or (new) AMF.

Implemented with (target) for the moment.

Maurice Pope