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