Merge branch 't/patch490'