Merge "fixes from vCPE testing"