WFLY-1177 WIP