Fff in release

Replaces pull request #652 by aspataru