parentfix
Merge branch 'checkinit' into develop