[D11] merge from d11 main branch: nb: need to fix namespace/class clash in ConvertSceneItems, will do after this commit. Also needs a further incremental update because this merge happened in the midst of some server related issues I think.