Merge "Refactoring ScrimController"