Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft