Merge pull request #4128 from jmarshallnz/activeae_fixes