Code

Merge branch 'lt/logopt' into next