jf: CM extractored

Change-Id: I518b7e6c146be30df010f45c9dae1262eb1854a3