Merge "Update controller config"