Merge pull request #6473 from t-8ch/master