Merge "Fixed a heads up crash" into mnc-dev