Merge "exception: Add FIXME about code duplication"