Release 5.1: Fixes dist issues with vapi