Merge "Fix issue #8176917: Stabillity : Native Crash :"