Merge pull request #4985 from adiaaida/2442