Merge pull request #4061 from fiwswe/implement_4060