Merge pull request #2168 from bradymiller/log-engine-work_1