Merge "MPC Lab refactor"