Merge "Make sure ReorderAlgorithm only work on the logic layer and not on the view layer" into main