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