[No reviewer] Sto721

Merging already reviewed changes for sto721
Also fixes #40