JPM/TJ: cleanup license.
Merge tag '4.10.12'

FilterMessages accepts name