Merge pull request #5695 from blissland/master