Merge app config changes from YAVA.