Merge pull request #265 from fsb4000/cherry-pick