Merge "Add support of args and kwargs in call_until_true"