Merge "VDM demo: all repohooks fixed for demos/" into main