Fixed Pacemaker
Merge branch 'fortissStable'
Merge remote-tracking branch 'origin/master'