WFLY-1764: Second part