Merge "[UUI] New Solve 2 components in one Docker"