Merge branch 'pr/3908'