merged diffs with source after veox latest commit (377266a2640).