caf changes by @chil360