Merge "New stream for hc2vpp stable/1701"