Merge remote-tracking branch 'remotes/origin/github/pr/52'