Merge "add aafshiro feature config files"