WFLY-490 -- subtasks WFLY-1819 and WFLY-1820