Merge pull request #3690 from naglis/sharesix