Merge pull request #5251 from miqrogroove/patch-1