manual merge maxin changes