Merge branch 'pr/n1808_vbjay'