Merge pull request #5251 from selanf/x06