Merge branch 'lt/logopt'