Merge pull request #2315 from ilya-lavrenov:nlmeans_perf