Merge "Updates after RenderableActor removal" into devel/master