Merge pull request #1002 from norio-nomura/fix-sr-4903-on-31