JCR-2125: Added more possibilities to get better performances on move