Merge "Fixed another crash with HUNs" into mnc-dev