Merge branch 'ad/aquaero'