Merge branch 'lt/core-optim'