Merge branch 'va_backend' into PO