WFU-3839 better handling of the has_enough_data attribute