Merge pull request #4457 from fritsch/pa-gotham-fixes

ActiveAE: Fixes for gotham