Additional note related to #2107.