merging applicability-performance branch and resolving conflicts