Merge "Fix crash issue" into devel/master