Merge "Avoid duplicating get_parameter_from_yaml"