Merge pull request #12467 from EragonJ/bug-914362

Bug 914362 - fix long device name problem