Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements