Frequency computation has been upgraded.
Merge origin/master