End of STF 625. Code frozen before merging to master