Merge "CE: Move knowledge of the OutputLayers out of Output"