Merge pull request #341 from nontas/aam_pyramid

AAM refactoring & benchmark
Merge remote-tracking branch 'upstream/master' into clm_sdm_fixes
Skip the broken test until @nontas fixes it