Merge "Model Manager final proxy setup"