Merge remote-tracking branch 'github/pr/292/head'