merged WFLY-3552 from 1979bf3f3a60f5f268b309504a4303a7adfbaf82