Add a default option to override agent max memory
Merge remote-tracking branch 'origin/master' into development