set_skip_wait_functions
Merge branch 'developing' into skip_wait_functions
bug: hash dict
Merge branch 'skip_wait_functions' into developing