Merge pull request #106 from soichi777/7230-2.3-3
Merge pull request #113 from soichi777/7230-2.3-4
feteched upstream