Merge branch 'pr/2431'