Merge branch 'planetbeing-1.0' into 1.0
Merged similiar cases (to match fix in beta2)
Merge branch 'planetbeing-1.0' into 1.0