Dev upmerge after accepting PR

Dev upmerge after accepting PR from dajohi/seelog -> master.