adde stof as a merger
feature #3989 adde stof as a merger (fabpot)

This PR was merged into the 2.3 branch.

Discussion
----------

adde stof as a merger

Commits
-------

5ce376e adde stof as a merger