Wait for logging enhanced to find bug
Merge pull request #1047 from psav/wait_for_logging

Wait for logging enhanced to find bug