Merge with quincy common configuration and Modified