Merge "Add method to remove file from history based on matching file path." into sc-dev