openvix: build 098
Merge branch '2.3' into 2.4