fixed issues related to raptor prefab
Merge branch 'raptor_prefab_fix'