[Code] Added comment for previous commit (Crash fix)
Merge remote-tracking branch 'upstream/master'