Add force parameter for concat
Add validate for force_concat
Merge in force_zone
Fix manual merge