Take the latest from CF

Change-Id: I12c355fe1c5325f2e90cb8cb77f6f7f1265bf6cc