Merge "Remove "primary_directory" and "secondary_directory" from initial values" into rvc-qpr-dev