Merge "Fix a crash issue" into devel/master