Merge remote-tracking branch 'github/pr/2453'