manual merge from mirrors branch (2020), need to fix shader compile error before I can test prefabs