Merge "Fixed a crash with HUN's" into mnc-dev