Merge pull request #5717 from blissland/master