Working on overflow logging.
Merge branch 'test' into dev