WFLY-1904 More work done