minor perf optimizations
Merge branch 'computeactivation2'