Merge "Fix VID to MSO password" into release-1.1.0