Merge movement refactoring changes