Merge branch 'pr/1649'