Merge branch 'mi_non_forking_without_waiting' into 'develop'

hfm: non-forking app did not sleep when waiting for a new block

See merge request hive/haf!31