Merge "Fixed crash issue by null reference" into devel/master