Merge branch 'pr/2454'