Leonardo Zanivan commented on Enhancement WELD-2504