Last changes
Merge branch 'cuttingedge'
Fixed double build
Fortiss stable used