Manual merge from human_Scene