REPORT-641: Follow-up bug fix commit to handle parameter replacement scenarios where one parameter name is a substring of another parameter name.