Merge commit 'origin/openvg-1.0'