Merge "Fix crash due to reverse selection." into mnc-dev