Better fix for U4-5564 - replaces reverted part of Pull #492
Clean up comments.
Merge pull request #592 from Bitmapped/7.2.1-U4-5564

Better fix for U4-5564