Merge pull request #5256 from selanf/x02