Bring back CFX features from merge

Change-Id: I55003c8259a6cee19694f81cda9a868c7673d110