Merge "Switched wtf in DimLayerController to warning instead" into oc-dev