squashed caf commits