Merge "Add keys, values and volumes for properties files"