Merge branch 'an/merge-single-strategy-optim'

Code optimization for a common case. * an/merge-single-strategy-optim: merge: optimization to skip evaluate_result for single strategy