Merge pull request #11890 from blckmn/incorrect_def