Mark Paluch commented on Improvement OGM-1137