Fixes: #2859 Added comment modifier, force uid unicity