Merge branch 'vexp-ve-updates' into vexpress