Interm commit to fix issue with export logs.