CAF Merge

Signed-off-by: Javelin <javelinanddart@gmail.com>