Merge "Fixed crash issues" into devel/master