Merge "Check vector size before accessing" into mnc-dev