Merge "Model Manager system"