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