SGA fixes - AEE
SGA fixes - AEE on triangle
Merge branch 'master' into Presentation
Adaptation strategy
Fixes sga
Merge branch 'master' into Presentation
Uncommented to merge from master