Merge "Code to read from change_tag_def table instead of valid_tag"