Merge branch 'sb/indent-heuristic-optim'