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