Merge branch 'feature/LR' into split/mdedonno