Merge Valessio's branch 'lp2019' into stable