More TODO updates, removed an unused trait method, and added impl Error for all errors.
enabled an automatic merge when the pipeline for 6ca56237 succeeds
merged
mentioned in commit 0d488765