Added FlexPage waiting mechanism