Temporary fix for Weld 2.1.2 until ERRAI-700 can be addressed