WFLY-4207 and WFLY-4208