WELD-1501 Make WELD-1480 configurable from the application