caf merge/fixes