Updated CAF script with @RobertFewins-Kalb's changes

Reducing chance of commit conflicts.