Merge branch 'vexp-local-fixes' into vexpress