Changed aeff to have one default for V15
Merge commit 'e34f37556800afbca1e56cbdd2378d1b061107e2' into llr_optimizer_initial

* commit 'e34f37556800afbca1e56cbdd2378d1b061107e2':
  Changed aeff to have one default for V15